fix xscale and yscale behaviour which havoc broke. they have to default to

Mon Sep 10 16:55:49 2001  Tim Janik  <timj@gtk.org>

        * gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
        behaviour which havoc broke. they have to default to 1.0 for
        expand behaviour.

        * gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.

diff --git a/ChangeLog b/ChangeLog
index 37dc4773906142d74df51df8caef72061a32a819..8455a418a9c827c0095ae3ad6ee2d8d30fc1b12f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Sep 10 16:55:49 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
+       behaviour which havoc broke. they have to default to 1.0 for
+       expand behaviour.
+
+       * gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
+
 2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtkstyle.c (_gtk_style_peek_property_value)

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 37dc4773906142d74df51df8caef72061a32a819..8455a418a9c827c0095ae3ad6ee2d8d30fc1b12f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Mon Sep 10 16:55:49 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
+       behaviour which havoc broke. they have to default to 1.0 for
+       expand behaviour.
+
+       * gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
+
 2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtkstyle.c (_gtk_style_peek_property_value)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 37dc4773906142d74df51df8caef72061a32a819..8455a418a9c827c0095ae3ad6ee2d8d30fc1b12f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Mon Sep 10 16:55:49 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
+       behaviour which havoc broke. they have to default to 1.0 for
+       expand behaviour.
+
+       * gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
+
 2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtkstyle.c (_gtk_style_peek_property_value)

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 37dc4773906142d74df51df8caef72061a32a819..8455a418a9c827c0095ae3ad6ee2d8d30fc1b12f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Mon Sep 10 16:55:49 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
+       behaviour which havoc broke. they have to default to 1.0 for
+       expand behaviour.
+
+       * gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
+
 2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtkstyle.c (_gtk_style_peek_property_value)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 37dc4773906142d74df51df8caef72061a32a819..8455a418a9c827c0095ae3ad6ee2d8d30fc1b12f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Mon Sep 10 16:55:49 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
+       behaviour which havoc broke. they have to default to 1.0 for
+       expand behaviour.
+
+       * gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
+
 2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtkstyle.c (_gtk_style_peek_property_value)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 37dc4773906142d74df51df8caef72061a32a819..8455a418a9c827c0095ae3ad6ee2d8d30fc1b12f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Mon Sep 10 16:55:49 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
+       behaviour which havoc broke. they have to default to 1.0 for
+       expand behaviour.
+
+       * gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
+
 2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtkstyle.c (_gtk_style_peek_property_value)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 37dc4773906142d74df51df8caef72061a32a819..8455a418a9c827c0095ae3ad6ee2d8d30fc1b12f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Mon Sep 10 16:55:49 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
+       behaviour which havoc broke. they have to default to 1.0 for
+       expand behaviour.
+
+       * gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
+
 2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtkstyle.c (_gtk_style_peek_property_value)

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 6d76016918d22a5e2d78674dfd74c567d583375f..2a750ab6a01c7b590f213fa2b9550e049eba70b1 100644 (file)
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -225,6 +225,12 @@ has the focus.
 
 @clist: The #GtkCList widget to check.
 
+<!-- ##### MACRO GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO GTK_ICON_SIZE_BUTTON ##### -->
 <para>
 
@@ -1785,6 +1791,13 @@ arrow.
 @show_toggle_indicator: unused
 @show_submenu_indicator: whether to show the arrow or not
 
+<!-- ##### MACRO gtk_notebook_set_page ##### -->
+<para>
+</para>
+
+@notebook: 
+@page_num: 
+
 <!-- ##### FUNCTION gtk_object_arg_get ##### -->
 <para>
 Private function to get an argument and argument info from an object.

diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml
index 4fa9b0e086fb1220754875455d76510d9c43b0f9..8c7596d839e68ebed5e2d8e8c59afc79110f2c31 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkcontainer.sgml
+++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml
@@ -38,13 +38,6 @@ GtkContainer
 @pspec: 
 
 
-<!-- ##### MACRO GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS ##### -->
-<para>
-
-</para>
-
-
-
 <!-- ##### MACRO gtk_container_border_width ##### -->
 <para>
 

diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml
index 04ce877083e566de92bed98071871f05fc009d1e..6f9e96d0c87663da9835c7ea4d85e7ff4457943d 100644 (file)
--- a/docs/reference/gtk/tmpl/gtknotebook.sgml
+++ b/docs/reference/gtk/tmpl/gtknotebook.sgml
@@ -132,15 +132,6 @@ Deprecated compatibility macro.
 @Returns: 
 
 
-<!-- ##### MACRO gtk_notebook_set_page ##### -->
-<para>
-</para>
-
-<!-- # Unused Parameters # -->
-@notebook: 
-@page_num: 
-
-
 <!-- ##### FUNCTION gtk_notebook_next_page ##### -->
 <para>
 </para>

diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 30ffca8235aa804f9d0033f0f1ed9b6a61d8fd94..cc0b23b6d217a6b8beefca09d47e350a7eb6068a 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -495,6 +495,7 @@ This can later be composited together with other
 #GtkRcStyle structures to form a #GtkStyle.
 </para>
 
+@parent_instance: 
 @name: 
 @bg_pixmap_name: 
 @font_desc: 

diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c
index f4eaa1c08ad76e8b954ea9890d376add25beb63b..44c759dab3943955d64d47058f9b19a62bd3b0a5 100644 (file)
--- a/gtk/gtkalignment.c
+++ b/gtk/gtkalignment.c
@@ -122,7 +122,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
                                                       _("Value between 0.0 and 1.0 to indicate X scale"),
                                                       0.0,
                                                       1.0,
-                                                      0.0,
+                                                      1.0,
                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
   g_object_class_install_property (gobject_class,
                                    PROP_YSCALE,
@@ -131,7 +131,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
                                                       _("Value between 0.0 and 1.0 to indicate Y scale"),
                                                       0.0,
                                                       1.0,
-                                                      0.0,
+                                                      1.0,
                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
 }
 
@@ -142,8 +142,8 @@ gtk_alignment_init (GtkAlignment *alignment)
 
   alignment->xalign = 0.5;
   alignment->yalign = 0.5;
-  alignment->xscale = 0.0;
-  alignment->yscale = 0.0;
+  alignment->xscale = 1.0;
+  alignment->yscale = 1.0;
 }
 
 GtkWidget*

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 3b9c68dc0e137a6410581e0f68110aa8fc184e61..cc5e87e13cda1de080140bf4e443f03733435cfe 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -742,8 +742,7 @@ gtk_window_get_property (GObject      *object,
       g_value_set_boolean (value, window->destroy_with_parent);
       break;
     case PROP_ICON:
-      g_value_set_object (value,
-                          G_OBJECT (gtk_window_get_icon (window)));
+      g_value_set_object (value, gtk_window_get_icon (window));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);